Remove some unnecessary diffs vs. native Linux. We now don't use the Xen

FLAT_foo segment selectors at all.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c
index 34576b17fa81d50a656e63c5a8af193c255f2368..c7b1518503414b3a1e0988a0d1e25d6e0b416e31 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/traps-xen.c
@@ -1096,12 +1096,6 @@ void __init trap_init(void)
 void smp_trap_init(trap_info_t *trap_ctxt)
 {
        trap_info_t *t = trap_table;
-       int i;
-
-       for (i = 0; i < 256; i++) {
-               trap_ctxt[i].vector = i;
-               trap_ctxt[i].cs     = FLAT_KERNEL_CS;
-       }
 
        for (t = trap_table; t->address; t++) {
                trap_ctxt[t->vector].flags = t->flags;

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c
index 0568511c06bfa9961da844b7cb32610bf53e4d5b..bcd0f0627da43ca8fbd1eb6f05bdf2a9fd0fe280 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/traps-xen.c
@@ -997,12 +997,6 @@ void __init trap_init(void)
 void smp_trap_init(trap_info_t *trap_ctxt)
 {
        trap_info_t *t = trap_table;
-       int i;
-
-       for (i = 0; i < 256; i++) {
-               trap_ctxt[i].vector = i;
-               trap_ctxt[i].cs     = FLAT_KERNEL_CS;
-       }
 
        for (t = trap_table; t->address; t++) {
                trap_ctxt[t->vector].flags = t->flags;

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h
index 96a509c93e04fe00b03ddef1a8e27f43cc0cd287..f9a75b33a3b5931553d16412ca3731a07d877d4a 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/segment.h
@@ -87,9 +87,11 @@
 
 /* Simple and small GDT entries for booting only */
 
-#define __BOOT_CS      FLAT_KERNEL_CS
+#define GDT_ENTRY_BOOT_CS              2
+#define __BOOT_CS      (GDT_ENTRY_BOOT_CS * 8)
 
-#define __BOOT_DS      FLAT_KERNEL_DS
+#define GDT_ENTRY_BOOT_DS              (GDT_ENTRY_BOOT_CS + 1)
+#define __BOOT_DS      (GDT_ENTRY_BOOT_DS * 8)
 
 /* The PnP BIOS entries in the GDT */
 #define GDT_ENTRY_PNPBIOS_CS32         (GDT_ENTRY_PNPBIOS_BASE + 0)